Skip to content

Conversation

@lwan-wanglin
Copy link
Member

@lwan-wanglin lwan-wanglin commented Nov 12, 2025

Automately cherry-pick failed becasue of some conflict, manually did it
cherrypick-v1.x 9da077e

fix conflict for below files
CONFLICT (content): Merge conflict in bundle/manifests/multiarch-tuning-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in konflux.Dockerfile

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 12, 2025
@lwan-wanglin
Copy link
Member Author

/retest

@lwan-wanglin
Copy link
Member Author

/override ci/prow/ocp418-e2e-azure
beucase of an Azure cli issue Azure/azure-cli#30942, the fix is provided in openshift/installer#10067

@openshift-ci
Copy link

openshift-ci bot commented Nov 12, 2025

@lwan-wanglin: Overrode contexts on behalf of lwan-wanglin: ci/prow/ocp418-e2e-azure

In response to this:

/override ci/prow/ocp418-e2e-azure
beucase of an Azure cli issue Azure/azure-cli#30942, the fix is provided in openshift/installer#10067

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@AnnaZivkovic
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AnnaZivkovic, lwan-wanglin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [AnnaZivkovic,lwan-wanglin]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 0fda06b into outrigger-project:v1.x Nov 12, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants